diff --git a/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java b/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java
index 8fe82a06..20e18dcc 100644
--- a/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java
+++ b/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java
@@ -45,7 +45,7 @@ public void run(String... args) throws Exception {
             .block();
 
     // Print the each returned activity profile id to the console
-    response.getBody().stream().forEach(id -> System.out.println(id));
+    response.getBody().stream().forEach(System.out::println);
   }
 
   private void postActivityProfile() {
diff --git a/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java b/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java
index a5dc1005..95b8c1ab 100644
--- a/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java
+++ b/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java
@@ -40,7 +40,7 @@ public void run(String... args) throws Exception {
         .block();
 
     // Print the each returned profile id to the console
-    response.getBody().stream().forEach(id -> System.out.println(id));
+    response.getBody().stream().forEach(System.out::println);
 
   }
 
diff --git a/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java b/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java
index 87b1fddb..0ba5e321 100644
--- a/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java
+++ b/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java
@@ -40,7 +40,7 @@ public void run(String... args) throws Exception {
     StatementResult result = response.getBody();
 
     // Print the returned statements to the console
-    Arrays.asList(result.getStatements()).forEach(s -> System.out.println(s));
+    Arrays.asList(result.getStatements()).forEach(System.out::println);
 
     if (result.hasMore()) {
       // Get More Statements
@@ -48,7 +48,7 @@ public void run(String... args) throws Exception {
           client.getMoreStatements(r -> r.more(result.getMore())).block();
 
       // Print the returned statements to the console
-      Arrays.asList(more.getBody().getStatements()).forEach(s -> System.out.println(s));
+      Arrays.asList(more.getBody().getStatements()).forEach(System.out::println);
     }
   }
 
diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
index 35395be4..4062c83a 100644
--- a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -37,14 +37,14 @@ public void run(String... args) throws Exception {
     var statements = client.getStatementIterator().block();
 
     // Print the returned statements to the console
-    statements.toStream().forEach(s -> System.out.println(s));
+    statements.toStream().forEach(System.out::println);
 
     // Get Statements with Verb filter as StatementIterator
     var filteredStatements =
         client.getStatementIterator(r -> r.verb(Verb.ATTEMPTED)).block();
 
     // Print the returned statements to the console
-    filteredStatements.toStream().forEach(s -> System.out.println(s));
+    filteredStatements.toStream().forEach(System.out::println);
 
   }
 
diff --git a/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java b/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
index 48b32a49..17619281 100644
--- a/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
+++ b/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
@@ -38,7 +38,7 @@ public void run(String... args) throws Exception {
     ResponseEntity<StatementResult> response = client.getStatements().block();
 
     // Print the returned statements to the console
-    response.getBody().getStatements().forEach(s -> System.out.println(s));
+    response.getBody().getStatements().forEach(System.out::println);
 
 
 
@@ -47,7 +47,7 @@ public void run(String... args) throws Exception {
         client.getStatements(r -> r.verb(Verb.ATTEMPTED.getId())).block();
 
     // Print the returned statements to the console
-    filteredResponse.getBody().getStatements().forEach(s -> System.out.println(s));
+    filteredResponse.getBody().getStatements().forEach(System.out::println);
 
   }
 
diff --git a/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java b/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java
index 7a3b6dba..86ff110c 100644
--- a/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java
+++ b/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java
@@ -49,7 +49,7 @@ public void run(String... args) throws Exception {
         .block();
 
     // Print the each returned state id to the console
-    response.getBody().stream().forEach(id -> System.out.println(id));
+    response.getBody().stream().forEach(System.out::println);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java
index 508216d9..32544fc6 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java
@@ -35,7 +35,7 @@ void whenBuildingDeleteActivityProfileRequestWithAllParametersThenNoExceptionIsT
         .profileId("bookmark");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -50,7 +50,7 @@ void whenBuildingDeleteActivityProfileRequestWithoutRegistrationThenNoExceptionI
         .profileId("bookmark");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -63,7 +63,7 @@ void whenBuildingDeleteActivityProfileRequestWithoutActivityIdThenExceptionIsThr
         .profileId("bookmark");
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -76,7 +76,7 @@ void whenBuildingDeleteActivityProfileRequestWithoutStateIdThenExceptionIsThrown
         .activityId(URI.create("https://example.com/activity/1"));
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java
index 9eeed4d9..1bd1477f 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java
@@ -39,7 +39,7 @@ void whenBuildingDeleteStateRequestWithAllParametersThenNoExceptionIsThrown() {
         .stateId("bookmark");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -56,7 +56,7 @@ void whenBuildingDeleteStateRequestWithoutRegistrationThenNoExceptionIsThrown()
         .stateId("bookmark");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -73,7 +73,7 @@ void whenBuildingDeleteStateRequestWithoutActivityIdThenExceptionIsThrown() {
         .stateId("bookmark");
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -90,7 +90,7 @@ void whenBuildingDeleteStateRequestWithoutAgentThenExceptionIsThrown() {
         .stateId("bookmark");
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -107,7 +107,7 @@ void whenBuildingDeleteStateRequestWithoutStateIdThenExceptionIsThrown() {
         .registration("67828e3a-d116-4e18-8af3-2d2c59e27be6");
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java
index 7b3bf91b..22fa9a33 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java
@@ -38,7 +38,7 @@ void whenBuildingDeleteStatesRequestWithAllParametersThenNoExceptionIsThrown() {
         .registration("67828e3a-d116-4e18-8af3-2d2c59e27be6");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -55,7 +55,7 @@ void whenBuildingDeleteStatesRequestWithRegistrationAsUUIDTypeThenNoExceptionIsT
         .registration(UUID.fromString("67828e3a-d116-4e18-8af3-2d2c59e27be6"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -72,7 +72,7 @@ void whenBuildingDeleteStatesRequestWithActivityIdAsURITypeThenNoExceptionIsThro
         .registration("67828e3a-d116-4e18-8af3-2d2c59e27be6");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -87,7 +87,7 @@ void whenBuildingDeleteStatesRequestWithoutRegistrationThenNoExceptionIsThrown()
         .agent(a -> a.name("A N Other").mbox("mailto:another@example.com"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -102,7 +102,7 @@ void whenBuildingDeleteStatesRequestWithoutActivityIdThenExceptionIsThrown() {
         .registration("67828e3a-d116-4e18-8af3-2d2c59e27be6");
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -117,7 +117,7 @@ void whenBuildingDeleteStatesRequestWithoutAgentThenExceptionIsThrown() {
         .registration("67828e3a-d116-4e18-8af3-2d2c59e27be6");
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java
index c6f74d0e..5477e25a 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java
@@ -36,7 +36,7 @@ void whenBuildingGetActivityProfilesRequestWithAllParametersThenNoExceptionIsThr
         .since(Instant.parse("2016-01-01T00:00:00Z"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -49,7 +49,7 @@ void whenBuildingGetActivityProfilesRequestWithActivityIdAsURITypeThenNoExceptio
         .activityId(URI.create("https://example.com/activity/1"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -62,7 +62,7 @@ void whenBuildingGetActivityProfilesRequestWithoutRegistrationThenNoExceptionIsT
         .activityId("https://example.com/activity/1");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -73,7 +73,7 @@ void whenBuildingGetActivityProfilesRequestWithoutActivityIdThenExceptionIsThrow
     Builder builder = GetActivityProfilesRequest.builder();
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java
index 99e27bfe..f27469bd 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java
@@ -29,7 +29,7 @@ void whenBuildingGetMoreStatementsRequestWithUriParameterThenNoExceptionIsThrown
             URI.create("https://example.com/xapi/statements/869cc589-76fa-4283-8e96-eea86f9124e1"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -42,7 +42,7 @@ void whenBuildingGetMoreStatementsRequestWithStringParameterThenNoExceptionIsThr
         .more("https://example.com/xapi/statements/869cc589-76fa-4283-8e96-eea86f9124e1");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -53,7 +53,7 @@ void whenBuildingGetMoreStatementsRequestWithoutMoreThenNullPointerExceptionIsTh
     GetMoreStatementsRequest.Builder builder = GetMoreStatementsRequest.builder();
 
     // Then NullPointerException Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java
index 538cf75d..022ec00f 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java
@@ -39,7 +39,7 @@ void whenBuildingGetStateRequestWithAllParametersThenNoExceptionIsThrown() {
         .stateId("bookmark");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -56,7 +56,7 @@ void whenBuildingGetStateRequestWithoutRegistrationThenNoExceptionIsThrown() {
         .stateId("bookmark");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -71,7 +71,7 @@ void whenBuildingGetStateRequestWithoutActivityIdThenNullPointerExceptionIsThrow
         .stateId("bookmark");
 
     // Then Null Pointer Exception Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -86,7 +86,7 @@ void whenBuildingGetStateRequestWithoutAgentThenNullPointerExceptionIsThrown() {
         .stateId("bookmark");
 
     // Then Null Pointer Exception Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -101,7 +101,7 @@ void whenBuildingGetStateRequestWithoutStateIdThenNullPointerExceptionIsThrown()
         .agent(a -> a.name("A N Other").mbox("mailto:another@example.com"));
 
     // Then Null Pointer Exception Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java
index cb40ef06..17d9cfb9 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java
@@ -51,7 +51,7 @@ void whenBuildingGetStatementsRequestWithAllParametersThenNoExceptionIsThrown()
         .ascending(true);
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java
index 83acb6d2..38a5e744 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java
@@ -40,7 +40,7 @@ void whenBuildingGetStatesRequestWithAllParametersThenNoExceptionIsThrown() {
         .since(Instant.now());
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -57,7 +57,7 @@ void whenBuildingGetStatesRequestWithoutSinceParameterThenNoExceptionIsThrown()
         .registration("67828e3a-d116-4e18-8af3-2d2c59e27be6");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -72,7 +72,7 @@ void whenBuildingGetStatesRequestWithoutRegistrationParameterThenNoExceptionIsTh
         .agent(a -> a.name("A N Other").mbox("mailto:another@example.com"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -87,7 +87,7 @@ void whenBuildingGetStatesRequestWithRequiredParametersThenNoExceptionIsThrown()
         .agent(a -> a.name("A N Other").mbox("mailto:another@example.com"));
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
@@ -100,7 +100,7 @@ void whenBuildingGetStatesRequestWithoutActivityIdThenNullPointerExceptionIsThro
         .agent(a -> a.name("A N Other").mbox("mailto:another@example.com"));
 
     // Then Null Pointer Exception Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
@@ -113,7 +113,7 @@ void whenBuildingGetStatesRequestWithoutAgentThenNullPointerExceptionIsThrown()
         .activityId("https://example.com/activity/1");
 
     // Then Null Pointer Exception Is Thrown
-    assertThrows(NullPointerException.class, () -> builder.build());
+    assertThrows(NullPointerException.class, builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java
index c538b85b..cd93f763 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java
@@ -40,7 +40,7 @@ void whenBuildingPostStateRequestWithAllParametersThenNoExceptionIsThrown() {
         .state("Hello World!");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java
index f1197e7d..69367a3f 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java
@@ -40,7 +40,7 @@ void whenBuildingPutStateRequestWithAllParametersThenNoExceptionIsThrown() {
         .state("Hello World!");
 
     // Then No Exception Is Thrown
-    assertDoesNotThrow(() -> builder.build());
+    assertDoesNotThrow(builder::build);
 
   }