diff --git a/build.gradle b/build.gradle
index 795eb06..000c19f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f3e4975..a7c257d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jan 20 01:13:22 IRST 2018
+#Tue Aug 04 19:36:08 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index d224b76..3ec4d62 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 7
-        versionName "5.0.19"
+        versionCode 8
+        versionName "6.0.19"
     }
     buildTypes {
         release {
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 0578216..19af98e 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <manifest package="com.developer.progressx">
-    
     <application />
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/library/src/main/java/com/developer/progressx/ProgressWheel.java b/library/src/main/java/com/developer/progressx/ProgressWheel.java
index fc42061..50c784b 100644
--- a/library/src/main/java/com/developer/progressx/ProgressWheel.java
+++ b/library/src/main/java/com/developer/progressx/ProgressWheel.java
@@ -17,16 +17,10 @@
 import android.util.TypedValue;
 import android.view.View;
 
-/**
- * @author tkdco , TutorialsAndroid
- */
 public class ProgressWheel extends View {
+
   private final int barLength = 16;
-  /**
-   * *********
-   * DEFAULTS *
-   * **********
-   */
+
   //Sizes (with defaults in DP)
   private int circleRadius = 28;
   private int barWidth = 4;
@@ -37,6 +31,7 @@ public class ProgressWheel extends View {
   private float barExtraLength = 0;
   private boolean barGrowingFromFront = true;
   private long pausedTimeWithoutGrowing = 0;
+
   //Colors (with defaults)
   private int barColor = 0xAA000000;
   private int rimColor = 0x00FFFFFF;
@@ -65,9 +60,6 @@ public class ProgressWheel extends View {
 
   private boolean shouldAnimate;
 
-  /**
-   * The constructor for the ProgressWheel
-   */
   public ProgressWheel(Context context, AttributeSet attrs) {
     super(context, attrs);
 
@@ -76,9 +68,6 @@ public ProgressWheel(Context context, AttributeSet attrs) {
     setAnimationEnabled();
   }
 
-  /**
-   * The constructor for the ProgressWheel
-   */
   public ProgressWheel(Context context) {
     super(context);
     setAnimationEnabled();
@@ -99,10 +88,6 @@ public ProgressWheel(Context context) {
     shouldAnimate = animationValue != 0;
   }
 
-  //----------------------------------
-  //Setting up stuff
-  //----------------------------------
-
   @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
diff --git a/sample/build.gradle b/sample/build.gradle
index e94b3a5..1ed9b7c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.developer.progressx.custom"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 7
-        versionName "5.0.19"
+        versionCode 8
+        versionName "6.0.19"
     }
     buildTypes {
         release {