diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy
index 2d7ee84..d80aef0 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy
@@ -13,22 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+package io.spring.gradle.convention
 
-package io.spring.gradle.convention;
-
-import org.gradle.api.Project;
-import org.gradle.api.plugins.PluginManager;
-import org.gradle.api.plugins.WarPlugin
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.tasks.testing.Test
+import org.gradle.api.Project
+import org.gradle.api.plugins.PluginManager
 
 /**
  * @author Rob Winch
  */
-public class SpringSampleBootPlugin extends SpringSamplePlugin {
+class SpringSampleBootPlugin extends SpringSamplePlugin {
 
 	@Override
-	public void additionalPlugins(Project project) {
+	void additionalPlugins(Project project) {
+
 		super.additionalPlugins(project);
 
 		PluginManager pluginManager = project.getPluginManager();
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy
index 37ae6cf..3a065c7 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy
@@ -13,7 +13,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-
 package io.spring.gradle.convention;
 
 import org.gradle.api.Project
@@ -22,10 +21,11 @@ import org.sonarqube.gradle.SonarQubePlugin;
 /**
  * @author Rob Winch
  */
-public class SpringSamplePlugin extends AbstractSpringJavaPlugin {
+class SpringSamplePlugin extends AbstractSpringJavaPlugin {
 
 	@Override
-	public void additionalPlugins(Project project) {
+	void additionalPlugins(Project project) {
+
 		project.plugins.withType(SonarQubePlugin) {
 			project.sonarqube.skipProject = true
 		}
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
index 59bb154..72185b9 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
@@ -13,7 +13,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-
 package io.spring.gradle.convention
 
 import org.gradle.api.Project
@@ -24,10 +23,11 @@ import org.gradle.api.tasks.testing.Test
 /**
  * @author Rob Winch
  */
-public class SpringSampleWarPlugin extends SpringSamplePlugin {
+class SpringSampleWarPlugin extends SpringSamplePlugin {
 
 	@Override
-	public void additionalPlugins(Project project) {
+	void additionalPlugins(Project project) {
+
 		super.additionalPlugins(project);
 
 		PluginManager pluginManager = project.getPluginManager();
@@ -51,6 +51,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {
 				}
 			}
 		}
+
 		project.tasks.withType(org.akhikhl.gretty.AppBeforeIntegrationTestTask).all { task ->
 			task.dependsOn prepareAppServerForIntegrationTests
 		}
@@ -63,6 +64,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {
 	}
 
 	def applyForIntegrationTest(Project project, Task integrationTest) {
+
 		project.gretty.integrationTestTask = integrationTest.name
 
 		integrationTest.doFirst {
@@ -89,9 +91,9 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {
 	}
 
 	def getRandomPort() {
-		ServerSocket ss = new ServerSocket(0)
-		int port = ss.localPort
-		ss.close()
+		ServerSocket serverSocket = new ServerSocket(0)
+		int port = serverSocket.localPort
+		serverSocket.close()
 		return port
 	}
 }