diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java
index 2804cd8c..4b83576f 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java
@@ -382,10 +382,13 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration {
 			resolveProperty(poolProperty("servers"), (String) null));
 
 		if (StringUtils.hasText(serversFromProperty)) {
+
 			String[] serverHostsPorts = serversFromProperty.split(",");
+
 			poolServers = ConnectionEndpointList.parse(CacheServer.DEFAULT_PORT, serverHostsPorts);
 		}
 		else {
+
 			poolServers = new ConnectionEndpointList();
 
 			AnnotationAttributes[] servers = (AnnotationAttributes[]) clientCacheApplicationAttributes.get("servers");
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java
index bdf9b76c..301172eb 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CompressionConfiguration.java
@@ -87,7 +87,9 @@ public class CompressionConfiguration extends AbstractAnnotationConfigSupport im
 	}
 
 	protected String resolveCompressorBeanName() {
-		return Optional.ofNullable(this.compressorBeanName).filter(StringUtils::hasText)
+
+		return Optional.ofNullable(this.compressorBeanName)
+			.filter(StringUtils::hasText)
 			.orElse(SNAPPY_COMPRESSOR_BEAN_NAME);
 	}
 
diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java
index 4bb0c71d..ea4aee4a 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java
@@ -854,12 +854,15 @@ public abstract class AbstractAnnotationConfigSupport
 	 */
 	protected Optional<Class<?>> resolveBeanClass(BeanDefinition beanDefinition, ClassLoader classLoader) {
 
-		Class<?> beanClass = (beanDefinition instanceof AbstractBeanDefinition
-			? safeResolveType(() -> ((AbstractBeanDefinition) beanDefinition).resolveBeanClass(classLoader)) : null);
+		Class<?> beanClass = beanDefinition instanceof AbstractBeanDefinition
+			? safeResolveType(() -> ((AbstractBeanDefinition) beanDefinition).resolveBeanClass(classLoader))
+			: null;
 
 		if (beanClass == null) {
-			beanClass = resolveBeanClassName(beanDefinition).map(beanClassName ->
-				safeResolveType(() -> ClassUtils.forName(beanClassName, classLoader))).orElse(null);
+			beanClass = resolveBeanClassName(beanDefinition)
+				.map(beanClassName ->
+					safeResolveType(() ->
+						ClassUtils.forName(beanClassName, classLoader))).orElse(null);
 		}
 
 		return Optional.ofNullable(beanClass);
@@ -895,8 +898,9 @@ public abstract class AbstractAnnotationConfigSupport
 	 */
 	protected Optional<String> resolveBeanClassName(BeanDefinition beanDefinition) {
 
-		Optional<String> beanClassName =
-			Optional.ofNullable(beanDefinition).map(BeanDefinition::getBeanClassName).filter(StringUtils::hasText);
+		Optional<String> beanClassName = Optional.ofNullable(beanDefinition)
+			.map(BeanDefinition::getBeanClassName)
+			.filter(StringUtils::hasText);
 
 		if (!beanClassName.isPresent()) {
 			beanClassName = Optional.ofNullable(beanDefinition)