diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java
index 2f6920f8..f48709d1 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableBeanFactoryLocator.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.config.annotation;
 
 import java.lang.annotation.Documented;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java
index 63b25373..77412f3a 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/DeclarableSupport.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 package org.springframework.data.gemfire.support;
 
 import static org.springframework.data.gemfire.support.GemfireBeanFactoryLocator.newBeanFactoryLocator;
@@ -26,8 +25,8 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.data.gemfire.PeerRegionFactoryBean;
 
 /**
- * Convenience class for Spring-aware GemFire {@link Declarable} components.  Provides subclasses with a reference
- * to the current Spring {@link BeanFactory} in orde to perform Spring bean lookups or resource loading.
+ * Convenience class for Spring aware, Apache Geode {@link Declarable} components.  Provides subclasses with a reference
+ * to the current Spring {@link BeanFactory} in order to perform Spring bean lookups or resource loading.
  *
  * Note, in most cases, the developer should just declare the same components as Spring beans in the Spring container,
  * through {@link PeerRegionFactoryBean}, which gives access to the full Spring container capabilities and does not
@@ -103,6 +102,6 @@ public abstract class DeclarableSupport implements CacheCallback, Declarable {
 	 * @inheritDoc
 	 */
 	@Override
-	public void close() {
-	}
+	public void close() { }
+
 }
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java
index 1e25cbbe..83dc5c87 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocator.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 package org.springframework.data.gemfire.support;
 
 import static org.springframework.data.gemfire.support.GemfireBeanFactoryLocator.BeanFactoryReference.newBeanFactoryReference;
@@ -28,9 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanNameAware;
@@ -39,6 +35,9 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * The {@link GemfireBeanFactoryLocator} class stores a reference to the Spring
  * {@link org.springframework.context.ApplicationContext} / {@link BeanFactory} needed to auto-wire
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java
index 37bd440b..b7b4a375 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java
@@ -25,9 +25,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.Declarable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.ApplicationListener;
@@ -46,6 +43,9 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * The {@link SpringContextBootstrappingInitializer} class is a GemFire configuration initializer used to bootstrap
  * a Spring {@link ApplicationContext} inside a GemFire Server JVM-based process.  This enables a GemFire Server