diff --git a/build.gradle b/build.gradle
index fb36797..a68c02b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,7 @@ contracts {
 }
 
 checkstyle {
+	toolVersion = "8.7"
 	configFile = new File(rootDir, "checkstyle.xml")
 }
 
diff --git a/checkstyle.xml b/checkstyle.xml
index a824750..fbefe3c 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,240 +1,215 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
 
-<!-- This is a checkstyle configuration file. For descriptions of
-what the following rules do, please see the checkstyle configuration
-page at http://checkstyle.sourceforge.net/config.html -->
+<!--
+    Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html.
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.sf.net (or in your downloaded distribution).
+    To completely disable a check, just comment it out or delete it from the file.
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
 
-<module name="Checker">
+    Some changes to the original google guide were done: Disabled "AvoidStarImport", mandatory
+    javadocs, and adjusted line length.
+ -->
 
-    <module name="FileTabCharacter">
-        <!-- Checks that there are no tab characters in the file.
-        -->
-    </module>
+<module name = "Checker">
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="warning"/>
 
-    <module name="RegexpSingleline">
-        <!-- Checks that FIXME is not used in comments.  TODO is preferred.
-        -->
-        <property name="format" value="((//.*)|(\*.*))FIXME"/>
-        <property name="message"
-                  value='TODO is preferred to FIXME.  e.g. "TODO(johndoe): Refactor when v2 is released."'/>
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
     </module>
 
-    <!-- All Java AST specific tests live under TreeWalker module. -->
     <module name="TreeWalker">
-
-        <!--
-
-        IMPORT CHECKS
-
-        -->
-
-        <module name="RedundantImport">
-            <!-- Checks for redundant import statements. -->
-            <property name="severity" value="error"/>
+        <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
         </module>
-
-        <module name="ImportOrder">
-            <!-- Checks for out of order import statements. -->
-            <property name="severity" value="error"/>
-            <property name="groups" value="com,cz,org,groovy,javax,java,spock"/>
-            <!-- This ensures that static imports go last. -->
-            <property name="option" value="bottom"/>
-            <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-
-       <!--
-
-        NAMING CHECKS
-
-        -->
-
-        <!-- Item 38 - Adhere to generally accepted naming conventions -->
-
-        <module name="PackageName">
-            <!-- Validates identifiers for package names against the
-            supplied expression. -->
-            <!-- Here the default checkstyle rule restricts package name parts to
-            seven characters, this is not in line with common practice at Google.
-            -->
-            <property name="format" value="^[a-z]+(\.[a-z][_a-z0-9]{1,})*$"/>
-            <property name="severity" value="error"/>
+        <module name="LineLength">
+            <property name="max" value="120"/>
+            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
+        <module name="OneTopLevelClass"/>
+        <module name="NoLineWrap"/>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly"/>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlySame"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="option" value="alone"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
         </module>
-
-        <module name="TypeNameCheck">
-            <!-- Validates static, final fields against the
-            expression "^[A-Z][a-zA-Z0-9]*$". -->
-            <metadata name="altname" value="TypeName"/>
-            <property name="severity" value="error"/>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <message key="ws.notFollowed"
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
         </module>
-
-        <module name="ConstantNameCheck">
-            <!-- Validates non-private, static, final fields against the supplied
-            public/package final fields "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
-            <metadata name="altname" value="ConstantName"/>
-            <property name="applyToPublic" value="true"/>
-            <property name="applyToProtected" value="true"/>
-            <property name="applyToPackage" value="true"/>
-            <property name="applyToPrivate" value="false"/>
-            <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|FLAG_.*)$"/>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
             <message key="name.invalidPattern"
-                     value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
-            <property name="severity" value="error"/>
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-        <module name="StaticVariableNameCheck">
-            <!-- Validates static, non-final fields against the supplied
-            expression "^[a-z][a-zA-Z0-9]*_?$". -->
-            <metadata name="altname" value="StaticVariableName"/>
-            <property name="applyToPublic" value="true"/>
-            <property name="applyToProtected" value="true"/>
-            <property name="applyToPackage" value="true"/>
-            <property name="applyToPrivate" value="true"/>
-            <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
-            <property name="severity" value="error"/>
+        <module name="TypeName">
+            <message key="name.invalidPattern"
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-        <module name="MethodNameCheck">
-        <!--&lt;!&ndash; Validates identifiers for method names. &ndash;&gt;-->
-        <metadata name="altname" value="MethodName"/>
-        <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
-        <property name="severity" value="error"/>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+                     value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
         <module name="ParameterName">
-            <!-- Validates identifiers for method parameters against the
-              expression "^[a-z][a-zA-Z0-9]*$". -->
-            <property name="severity" value="error"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-        <module name="LocalFinalVariableName">
-            <!-- Validates identifiers for local final variables against the
-              expression "^[a-z][a-zA-Z0-9]*$". -->
-            <property name="severity" value="error"/>
+        <module name="CatchParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
         <module name="LocalVariableName">
-            <!-- Validates identifiers for local variables against the
-            expression "^[a-z][a-zA-Z0-9]*$". -->
-            <property name="severity" value="error"/>
-        </module>
-
-
-        <!--
-
-        LENGTH and CODING CHECKS
-
-        -->
-
-        <module name="LineLength">
-            <!-- Checks if a line is too long. -->
-            <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="400"/>
-            <property name="severity" value="error"/>
-
-            <!--
-              The default ignore pattern exempts the following elements:
-                - import statements
-                - long URLs inside comments
-            -->
-
-            <property name="ignorePattern"
-                      value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-                      default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
-        </module>
-
-        <!-- Checks for braces around if and else blocks -->
-        <module name="NeedBraces">
-            <property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/>
-            <property name="severity" value="error"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-        <module name="UpperEll">
-            <!-- Checks that long constants are defined with an upper ell.-->
-            <property name="severity" value="error"/>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-        <module name="FallThrough">
-            <!-- Warn about falling through to the next case statement.  Similar to
-            javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
-            on the last non-blank line preceding the fallen-into case contains 'fall through' (or
-            some other variants which we don't publicized to promote consistency).
-            -->
-            <property name="reliefPattern"
-                      value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
-            <property name="severity" value="error"/>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-
-        <!--
-
-        MODIFIERS CHECKS
-
-        -->
-
-        <module name="ModifierOrder">
-            <!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
-                 8.4.3.  The prescribed order is:
-                 public, protected, private, abstract, static, final, transient, volatile,
-                 synchronized, native, strictfp
-              -->
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="Indentation">
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="4"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="4"/>
+            <property name="arrayInitIndent" value="4"/>
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="6"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+        </module>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
         </module>
-
-
-        <!--
-
-        WHITESPACE CHECKS
-
-        -->
-
-        <module name="WhitespaceAround">
-            <!-- Checks that various tokens are surrounded by whitespace.
-            This includes most binary operators and keywords followed
-            by regular or curly braces.
-            -->
-            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
-            BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
-            EQUAL, GE, GT, LAND, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
-            LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
-            LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
-            MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
-            SL, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
-            <property name="severity" value="error"/>
+        <module name="ParenPad"/>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
         </module>
-
-        <module name="WhitespaceAfter">
-            <!-- Checks that commas, semicolons and typecasts are followed by
-            whitespace.
-            -->
-            <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationMostCases"/>
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
         </module>
-
-        <module name="NoWhitespaceAfter">
-            <!-- Checks that there is no whitespace after various unary operators.
-                 Linebreaks are allowed.
-            -->
-            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
-        UNARY_PLUS"/>
-            <property name="allowLineBreaks" value="true"/>
-            <property name="severity" value="error"/>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationVariables"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
-
-        <module name="NoWhitespaceBefore">
-            <!-- Checks that there is no whitespace before various unary operators.
-                 Linebreaks are allowed.
-            -->
-            <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
-            <property name="allowLineBreaks" value="true"/>
-            <property name="severity" value="error"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>
-
-        <module name="ParenPad">
-            <!-- Checks that there is no whitespace before close parens or after
-                 open parens.
-            -->
-            <property name="severity" value="error"/>
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="expected"/>
         </module>
-
+        <module name="CommentsIndentation"/>
     </module>
 </module>
diff --git a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java
index 1964fb9..fe784ff 100644
--- a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java
+++ b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java
@@ -19,14 +19,14 @@ public class TripEventHandler {
     public TripEventHandler() {}
 
     @EventHandler
-    public void on(TripCreatedEvent event){
+    public void on(TripCreatedEvent event) {
         LOG.info("Trip created: {}", event.getId());
         tripRepository.save(new Trip(event.getId(), event.getUserId(),
                 event.getOriginAddress(), event.getDestinationAddress(), TripStatus.CREATED));
     }
 
     @EventHandler
-    public void on(TripCanceledEvent event){
+    public void on(TripCanceledEvent event) {
         LOG.info("Trip canceled: {}", event.getId());
         Trip trip = tripRepository.findOne(event.getId());
         trip.setStatus(TripStatus.CANCELED);
@@ -34,7 +34,7 @@ public void on(TripCanceledEvent event){
     }
 
     @EventHandler
-    public void on(TripStartedEvent event){
+    public void on(TripStartedEvent event) {
         LOG.info("Trip started: {}", event.getId());
         Trip trip = tripRepository.findOne(event.getId());
         trip.setStatus(TripStatus.STARTED);
@@ -42,7 +42,7 @@ public void on(TripStartedEvent event){
     }
 
     @EventHandler
-    public void on(TripCompletedEvent event){
+    public void on(TripCompletedEvent event) {
         LOG.info("Trip completed: {}", event.getId());
         Trip trip = tripRepository.findOne(event.getId());
         trip.setStatus(TripStatus.COMPLETED);
diff --git a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java
index 5be2d00..8b65353 100644
--- a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java
+++ b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java
@@ -1,32 +1,32 @@
 package org.aitesting.microservices.tripmanagement.query.domain.models;
 
-import org.aitesting.microservices.tripmanagement.common.events.TripStatus;
-
-import javax.validation.constraints.NotNull;
 import java.util.UUID;
+import javax.validation.constraints.NotNull;
+import org.aitesting.microservices.tripmanagement.common.events.TripStatus;
 
 public class Trip {
     @NotNull
     private UUID id;
-    private UUID userID;
+    private UUID userId;
     private String originAddress;
     private String destinationAddress;
 
     private TripStatus status;
 
-    public Trip(UUID id, UUID userID, String originAddress, String destinationAddress, TripStatus status) {
+    public Trip(UUID id, UUID userId, String originAddress, String destinationAddress, TripStatus status) {
         this.id = id;
-        this.userID = userID;
+        this.userId = userId;
         this.originAddress = originAddress;
         this.destinationAddress = destinationAddress;
         this.status = status;
     }
+
     public UUID getId() {
         return id;
     }
 
-    public UUID getUserID() {
-        return userID;
+    public UUID getUserId() {
+        return userId;
     }
 
     public String getOriginAddress() {
diff --git a/src/main/java/org/aitesting/microservices/tripmanagement/query/service/controllers/TripManagementController.java b/src/main/java/org/aitesting/microservices/tripmanagement/query/service/controllers/TripManagementController.java
index cbef8c4..7154367 100644
--- a/src/main/java/org/aitesting/microservices/tripmanagement/query/service/controllers/TripManagementController.java
+++ b/src/main/java/org/aitesting/microservices/tripmanagement/query/service/controllers/TripManagementController.java
@@ -1,14 +1,13 @@
 package org.aitesting.microservices.tripmanagement.query.service.controllers;
 
+import java.util.List;
+import java.util.UUID;
 import org.aitesting.microservices.tripmanagement.common.exceptions.NotFoundException;
 import org.aitesting.microservices.tripmanagement.query.domain.models.Trip;
 import org.aitesting.microservices.tripmanagement.query.service.repositories.TripRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.UUID;
-
 @RestController
 @RequestMapping("api")
 public class TripManagementController {
diff --git a/src/main/java/org/aitesting/microservices/tripmanagement/query/service/repositories/TripRepository.java b/src/main/java/org/aitesting/microservices/tripmanagement/query/service/repositories/TripRepository.java
index fd576cf..51288ea 100644
--- a/src/main/java/org/aitesting/microservices/tripmanagement/query/service/repositories/TripRepository.java
+++ b/src/main/java/org/aitesting/microservices/tripmanagement/query/service/repositories/TripRepository.java
@@ -1,9 +1,8 @@
 package org.aitesting.microservices.tripmanagement.query.service.repositories;
 
+import java.util.UUID;
 import org.aitesting.microservices.tripmanagement.query.domain.models.Trip;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import java.util.UUID;
-
-public interface TripRepository  extends MongoRepository<Trip, UUID>{
+public interface TripRepository  extends MongoRepository<Trip, UUID> {
 }
diff --git a/src/test/java/org/aitesting/microservices/tests/provider/TripContractBase.java b/src/test/java/org/aitesting/microservices/tests/provider/TripContractBase.java
index 7c5d00d..52630b2 100644
--- a/src/test/java/org/aitesting/microservices/tests/provider/TripContractBase.java
+++ b/src/test/java/org/aitesting/microservices/tests/provider/TripContractBase.java
@@ -1,5 +1,8 @@
 package org.aitesting.microservices.tests.provider;
 
+import static org.aitesting.microservices.tests.helpers.TestConstants.*;
+
+import io.restassured.module.mockmvc.RestAssuredMockMvc;
 import org.aitesting.microservices.tripmanagement.common.events.TripStatus;
 import org.aitesting.microservices.tripmanagement.query.TripManagementQueryApplication;
 import org.aitesting.microservices.tripmanagement.query.domain.models.Trip;
@@ -11,9 +14,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.context.WebApplicationContext;
-import io.restassured.module.mockmvc.RestAssuredMockMvc;
-
-import static org.aitesting.microservices.tests.helpers.TestConstants.*;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TripManagementQueryApplication.class)
diff --git a/src/test/java/org/aitesting/microservices/tests/unit/TripEventHandlerUnitTests.java b/src/test/java/org/aitesting/microservices/tests/unit/TripEventHandlerUnitTests.java
index 7a9d32f..d9f53c7 100644
--- a/src/test/java/org/aitesting/microservices/tests/unit/TripEventHandlerUnitTests.java
+++ b/src/test/java/org/aitesting/microservices/tests/unit/TripEventHandlerUnitTests.java
@@ -1,5 +1,11 @@
 package org.aitesting.microservices.tests.unit;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.UUID;
 import org.aitesting.microservices.tripmanagement.common.events.*;
 import org.aitesting.microservices.tripmanagement.query.domain.eventhandlers.TripEventHandler;
 import org.aitesting.microservices.tripmanagement.query.domain.models.Trip;
@@ -11,13 +17,6 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import java.util.UUID;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(MockitoJUnitRunner.class)
 public class TripEventHandlerUnitTests {
 
@@ -43,12 +42,12 @@ public class TripEventHandlerUnitTests {
     private static Trip trip;
 
     @Before
-    public void setup(){
+    public void setup() {
         when(tripRepository.findOne(any(UUID.class))).thenReturn(trip);
     }
 
     @Test
-    public void onTripCreatedEvent_SaveIsCalled(){
+    public void onTripCreatedEvent_SaveIsCalled() {
         //arrange
 
         //act
@@ -59,7 +58,7 @@ public void onTripCreatedEvent_SaveIsCalled(){
     }
 
     @Test
-    public void onTripCanceledEvent_FindOneIsCalled(){
+    public void onTripCanceledEvent_FindOneIsCalled() {
         //arrange
 
         //act
@@ -70,7 +69,7 @@ public void onTripCanceledEvent_FindOneIsCalled(){
     }
 
     @Test
-    public void onTripCanceledEvent_SaveIsCalled(){
+    public void onTripCanceledEvent_SaveIsCalled() {
         //arrange
 
         //act
@@ -81,7 +80,7 @@ public void onTripCanceledEvent_SaveIsCalled(){
     }
 
     @Test
-    public void onTripStartedEvent_SaveIsCalled(){
+    public void onTripStartedEvent_SaveIsCalled() {
         //arrange
 
         //act
@@ -92,7 +91,7 @@ public void onTripStartedEvent_SaveIsCalled(){
     }
 
     @Test
-    public void onTripCompletedEvent_SaveIsCalled(){
+    public void onTripCompletedEvent_SaveIsCalled() {
         //arrange
 
         //act
diff --git a/src/test/java/org/aitesting/microservices/tests/unit/TripManagementControllerUnitTests.java b/src/test/java/org/aitesting/microservices/tests/unit/TripManagementControllerUnitTests.java
index eb9a38f..923215d 100644
--- a/src/test/java/org/aitesting/microservices/tests/unit/TripManagementControllerUnitTests.java
+++ b/src/test/java/org/aitesting/microservices/tests/unit/TripManagementControllerUnitTests.java
@@ -1,5 +1,9 @@
 package org.aitesting.microservices.tests.unit;
 
+import static org.aitesting.microservices.tests.helpers.TestConstants.TRIP_ID1;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import org.aitesting.microservices.tripmanagement.common.exceptions.NotFoundException;
 import org.aitesting.microservices.tripmanagement.query.service.controllers.TripManagementController;
 import org.aitesting.microservices.tripmanagement.query.service.repositories.TripRepository;
@@ -9,12 +13,6 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import java.util.UUID;
-
-import static org.aitesting.microservices.tests.helpers.TestConstants.TRIP_ID1;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
 @RunWith(MockitoJUnitRunner.class)
 public class TripManagementControllerUnitTests {
 
@@ -25,7 +23,7 @@ public class TripManagementControllerUnitTests {
     private TripRepository tripRepository;
 
     @Test
-    public void onGetTripsCall_FindAllIsCalled(){
+    public void onGetTripsCall_FindAllIsCalled() {
         //arrange
 
         //act
diff --git a/src/test/resources/contracts/tripmanagement/query/ShouldGetAllTrips.groovy b/src/test/resources/contracts/tripmanagement/query/ShouldGetAllTrips.groovy
index 31498a2..a1155a1 100644
--- a/src/test/resources/contracts/tripmanagement/query/ShouldGetAllTrips.groovy
+++ b/src/test/resources/contracts/tripmanagement/query/ShouldGetAllTrips.groovy
@@ -14,21 +14,21 @@ Contract.make {
             [
               {
                 "id": "f849769e-2534-84a6-d475-5c2d701343ab",
-                "userID": "123e4567-e89b-12d3-a456-426655440000",
+                "userId": "123e4567-e89b-12d3-a456-426655440000",
                 "originAddress": "from some place over there",
                 "destinationAddress": "to this other place",
                 "status": "STARTED"
               },
               {
                 "id": "5b842415-9447-4b9b-85c6-2e1075214cc4",
-                "userID": "123e4567-e89b-12d3-a456-426655440000",
+                "userId": "123e4567-e89b-12d3-a456-426655440000",
                 "originAddress": "from some place over there",
                 "destinationAddress": "to this other place",
                 "status": "CREATED"
               },
               {
                 "id": "7a7d1e99-4823-4aa5-9d3b-2307e88cee0d",
-                "userID": "123e4567-e89b-12d3-a456-426655440000",
+                "userId": "123e4567-e89b-12d3-a456-426655440000",
                 "originAddress": "from some place over there",
                 "destinationAddress": "to this other place",
                 "status": "COMPLETED"
diff --git a/src/test/resources/contracts/tripmanagement/query/ShouldGetTrip.groovy b/src/test/resources/contracts/tripmanagement/query/ShouldGetTrip.groovy
index 3a8e5be..32fb249 100644
--- a/src/test/resources/contracts/tripmanagement/query/ShouldGetTrip.groovy
+++ b/src/test/resources/contracts/tripmanagement/query/ShouldGetTrip.groovy
@@ -3,7 +3,7 @@ package tripmanagement.query
 import org.springframework.cloud.contract.spec.*
 
 Contract.make {
-    description("When a Get request with a TripID is made, the corresponding trip is returned")
+    description("When a Get request with a TripId is made, the corresponding trip is returned")
     request {
         method 'GET'
         url '/api/trip/f849769e-2534-84a6-d475-5c2d701343ab'
@@ -12,7 +12,7 @@ Contract.make {
         status 200
         body(
             "id": "f849769e-2534-84a6-d475-5c2d701343ab",
-            "userID": "123e4567-e89b-12d3-a456-426655440000",
+            "userId": "123e4567-e89b-12d3-a456-426655440000",
             "originAddress": "from some place over there",
             "destinationAddress": "to this other place",
             "status": "STARTED"