diff --git a/.gitignore b/.gitignore
index 2e361425..85ae9ace 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ out/
 target/
 .gradle
 .springBeans
+*.dat
 *.iml
 *.ipr
 *.iws
@@ -12,10 +13,9 @@ target/
 .classpath
 .project
 .settings/
-.idea/
 _site/
+.idea/
 .bak/
-*.dat
 
 /samples/hello-world/vf.gf.dmn-events.cfg
 /samples/hello-world/vf.gf.dmn-license.cfg
@@ -24,4 +24,5 @@ _site/
 /vf.gf.dmn-license.cfg
 
 BACKUP*
+ConfigDiskDir*
 newDB
diff --git a/spring-data-gemfire/pom.xml b/spring-data-gemfire/pom.xml
index f915014d..575d9578 100644
--- a/spring-data-gemfire/pom.xml
+++ b/spring-data-gemfire/pom.xml
@@ -48,7 +48,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Apache Geode -->
+		<!-- Pivotal GemFire -->
 		<dependency>
 			<groupId>io.pivotal.gemfire</groupId>
 			<artifactId>geode-core</artifactId>
diff --git a/spring-data-geode-distribution/pom.xml b/spring-data-geode-distribution/pom.xml
index 6e35f2ad..af58b9c5 100644
--- a/spring-data-geode-distribution/pom.xml
+++ b/spring-data-geode-distribution/pom.xml
@@ -41,4 +41,5 @@
 			</plugin>
 		</plugins>
 	</build>
+
 </project>
diff --git a/spring-data-geode/pom.xml b/spring-data-geode/pom.xml
index 5f8c88b4..fdc7d56b 100644
--- a/spring-data-geode/pom.xml
+++ b/spring-data-geode/pom.xml
@@ -19,8 +19,8 @@
 	<url>https://projects.spring.io/spring-data-geode/spring-data-geode</url>
 
 	<properties>
-		<geode.version>1.10.0</geode.version>
 		<project.root>${basedir}/..</project.root>
+		<geode.version>1.10.0</geode.version>
 	</properties>
 
 	<dependencies>
@@ -180,13 +180,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>${assertj}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derbyLocale_zh_TW</artifactId>
@@ -202,9 +195,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>${hamcrest}</version>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -215,6 +208,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-library</artifactId>
+			<version>${hamcrest}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.iq80.snappy</groupId>
 			<artifactId>snappy</artifactId>