diff --git a/src/main/java/org/springframework/hateoas/mediatype/AffordanceModelFactory.java b/src/main/java/org/springframework/hateoas/mediatype/AffordanceModelFactory.java
index 1bfc7363..9e8b17dc 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/AffordanceModelFactory.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/AffordanceModelFactory.java
@@ -18,10 +18,10 @@ package org.springframework.hateoas.mediatype;
 import java.util.List;
 
 import org.springframework.hateoas.AffordanceModel;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.QueryParameter;
 import org.springframework.hateoas.AffordanceModel.InputPayloadMetadata;
 import org.springframework.hateoas.AffordanceModel.PayloadMetadata;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.QueryParameter;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/JacksonHelper.java b/src/main/java/org/springframework/hateoas/mediatype/JacksonHelper.java
index fdb30777..c0b3df2a 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/JacksonHelper.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/JacksonHelper.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.hateoas.mediatype;
 
-import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.EntityModel;
 
 import com.fasterxml.jackson.databind.JavaType;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonAffordanceModelFactory.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonAffordanceModelFactory.java
index d37de455..4c560e19 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonAffordanceModelFactory.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonAffordanceModelFactory.java
@@ -22,10 +22,10 @@ import java.util.List;
 import org.springframework.hateoas.AffordanceModel;
 import org.springframework.hateoas.AffordanceModel.InputPayloadMetadata;
 import org.springframework.hateoas.AffordanceModel.PayloadMetadata;
-import org.springframework.hateoas.mediatype.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
+import org.springframework.hateoas.mediatype.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java
index 60d7077b..29daa41a 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.hateoas.mediatype.collectionjson;
 
-import static com.fasterxml.jackson.annotation.JsonInclude.*;
-
 import lombok.Value;
 import lombok.With;
 
@@ -26,6 +24,7 @@ import org.springframework.lang.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionRepresentationModelMixin.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionRepresentationModelMixin.java
index 894c3d19..79cb19fc 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionRepresentationModelMixin.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionRepresentationModelMixin.java
@@ -15,9 +15,8 @@
  */
 package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
-
 import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.CollectionJsonResourcesDeserializer;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/EntityRepresentationModelMixin.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/EntityRepresentationModelMixin.java
index f4e0a342..429463eb 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/EntityRepresentationModelMixin.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/EntityRepresentationModelMixin.java
@@ -15,9 +15,8 @@
  */
 package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
-
 import org.springframework.hateoas.EntityModel;
+import org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.CollectionJsonResourceDeserializer;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
index 6fa27a37..94c2fdb7 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java
@@ -901,8 +901,8 @@ public class Jackson2CollectionJsonModule extends SimpleModule {
 	static class CollectionJsonPagedResourcesDeserializer extends CollectionJsonDeserializerBase<PagedModel<?>> {
 
 		private static final long serialVersionUID = -7465448422501330790L;
-		private static final BiFunction<List<Object>, Links, PagedModel<?>> FINISHER = (content,
-				links) -> PagedModel.of(content, null, links);
+		private static final BiFunction<List<Object>, Links, PagedModel<?>> FINISHER = (content, links) -> PagedModel
+				.of(content, null, links);
 		private static final Function<JavaType, CollectionJsonDeserializerBase<PagedModel<?>>> CONTEXTUAL_CREATOR = CollectionJsonPagedResourcesDeserializer::new;
 
 		CollectionJsonPagedResourcesDeserializer() {
diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/PagedResourcesMixin.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/PagedResourcesMixin.java
index d4ffb870..2bf30973 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/PagedResourcesMixin.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/PagedResourcesMixin.java
@@ -15,9 +15,8 @@
  */
 package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
-
 import org.springframework.hateoas.PagedModel;
+import org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.CollectionJsonPagedResourcesDeserializer;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsAffordanceModelFactory.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsAffordanceModelFactory.java
index fe4d4455..e752a25b 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsAffordanceModelFactory.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsAffordanceModelFactory.java
@@ -22,10 +22,10 @@ import java.util.List;
 import org.springframework.hateoas.AffordanceModel;
 import org.springframework.hateoas.AffordanceModel.InputPayloadMetadata;
 import org.springframework.hateoas.AffordanceModel.PayloadMetadata;
-import org.springframework.hateoas.mediatype.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
+import org.springframework.hateoas.mediatype.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 
diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/UberAffordanceModelFactory.java b/src/main/java/org/springframework/hateoas/mediatype/uber/UberAffordanceModelFactory.java
index 5b1eee71..c0efdcde 100644
--- a/src/main/java/org/springframework/hateoas/mediatype/uber/UberAffordanceModelFactory.java
+++ b/src/main/java/org/springframework/hateoas/mediatype/uber/UberAffordanceModelFactory.java
@@ -22,10 +22,10 @@ import java.util.List;
 import org.springframework.hateoas.AffordanceModel;
 import org.springframework.hateoas.AffordanceModel.InputPayloadMetadata;
 import org.springframework.hateoas.AffordanceModel.PayloadMetadata;
-import org.springframework.hateoas.mediatype.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
+import org.springframework.hateoas.mediatype.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 
diff --git a/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java b/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java
index cf78d9a8..81c0d617 100644
--- a/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java
+++ b/src/main/java/org/springframework/hateoas/server/reactive/ReactiveRepresentationModelAssembler.java
@@ -47,8 +47,7 @@ public interface ReactiveRepresentationModelAssembler<T, D extends Representatio
 	 * @param entities must not be {@literal null}.
 	 * @return {@link CollectionModel} containing {@code D}.
 	 */
-	default Mono<CollectionModel<D>> toCollectionModel(Flux<? extends T> entities,
-			ServerWebExchange exchange) {
+	default Mono<CollectionModel<D>> toCollectionModel(Flux<? extends T> entities, ServerWebExchange exchange) {
 
 		return entities.flatMap(entity -> toModel(entity, exchange)) //
 				.collectList() //
diff --git a/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java b/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java
index 84d7cf39..e84b4d31 100644
--- a/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java
+++ b/src/main/java/org/springframework/hateoas/server/reactive/SimpleReactiveRepresentationModelAssembler.java
@@ -62,8 +62,8 @@ public interface SimpleReactiveRepresentationModelAssembler<T>
 	 * @param entities must not be {@literal null}.
 	 * @return {@link CollectionModel} containing {@link EntityModel} of {@code T}.
 	 */
-	default Mono<CollectionModel<EntityModel<T>>> toCollectionModel(
-			Flux<? extends T> entities, ServerWebExchange exchange) {
+	default Mono<CollectionModel<EntityModel<T>>> toCollectionModel(Flux<? extends T> entities,
+			ServerWebExchange exchange) {
 
 		return entities //
 				.flatMap(entity -> toModel(entity, exchange)) //
@@ -77,8 +77,8 @@ public interface SimpleReactiveRepresentationModelAssembler<T>
 	 *
 	 * @param resources
 	 */
-	default CollectionModel<EntityModel<T>> addLinks(
-			CollectionModel<EntityModel<T>> resources, ServerWebExchange exchange) {
+	default CollectionModel<EntityModel<T>> addLinks(CollectionModel<EntityModel<T>> resources,
+			ServerWebExchange exchange) {
 		return resources;
 	}
 }