diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
index 5928ced49..e1ad6c630 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
@@ -44,7 +44,7 @@ class Constants {
     static final String DOWNLOADED_BUILD_TOOL_NAME = "downloaded.build.tool.name";
     static final String BUILD_TOOLS_VERSION = "build.tool.version";
     static final String DOWNLOADED_PLATFORM_NAME = "downloaded.platform.name";
-    static final String TARGET_VERSION =  "target.version";
+    static final String TARGET_VERSION = "target.version";
     static final String OS_TARGET = "os.target";
     // WSO2 AVD specific variables
     static final String WSO2_AVD_NAME = "WSO2_AVD";
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
index fa9e7316f..79edf52d9 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
@@ -113,6 +113,7 @@ public class TryIt {
 
     /**
      * This method is called when then is an error in getting system properties
+     *
      * @param error - system property name
      */
     private void sysPropertyError(String error) {
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java
index 9d910104f..d4ddd2265 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryItEmulator.java
@@ -57,15 +57,15 @@ public class TryItEmulator implements Runnable {
             System.out.println("Error in starting " + deviceId);
             e.printStackTrace();
         } finally {
-                try {
-                    if (reader != null){
-                        reader.close();
-                    }
-                    if (writer != null) {
-                        writer.close();
-                    }
-                } catch (IOException ignored) {
-                    //
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+                if (writer != null) {
+                    writer.close();
+                }
+            } catch (IOException ignored) {
+                //
             }
         }
         System.exit(0);
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
index 6566732ac..0b49fb1d3 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
@@ -18,7 +18,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <artifactId>android-plugin</artifactId>
@@ -52,7 +53,8 @@
                                     <artifactId>org.wso2.carbon.device.mgt.mobile.android.emulator</artifactId>
                                     <version>${project.version}</version>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/src/main/resources/android-tryit/</outputDirectory>
+                                    <outputDirectory>${project.basedir}/src/main/resources/android-tryit/
+                                    </outputDirectory>
                                     <destFileName>JavaApp.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
@@ -68,7 +70,7 @@
                         <phase>process-resources</phase>
                         <configuration>
                             <target>
-                                <ant antfile="build.xml" target="zip" />
+                                <ant antfile="build.xml" target="zip"/>
                             </target>
                         </configuration>
                         <goals>