diff --git a/app/build.gradle b/app/build.gradle
index 60f6666..4180076 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
 
-
 apply plugin: 'io.gitlab.arturbosch.detekt'
 
 android {
@@ -32,53 +31,48 @@ android {
 }
 
 dependencies {
-
     // standard
-    implementation project(':wrapper')
-    detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.2.2"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // wrapper
     implementation project(':wrapper')
     // retrofit
-    implementation "com.squareup.retrofit2:retrofit:2.6.2"
     implementation "com.squareup.retrofit2:converter-gson:2.6.2"
+    implementation "com.squareup.retrofit2:retrofit:2.6.2"
     // room database
-    implementation "androidx.room:room-runtime:$rootProject.roomVersion"
-    implementation "androidx.room:room-ktx:$rootProject.roomVersion"
     kapt "androidx.room:room-compiler:$rootProject.roomVersion"
+    implementation "androidx.room:room-ktx:$rootProject.roomVersion"
+    implementation "androidx.room:room-runtime:$rootProject.roomVersion"
     // lifecycle components
-    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.archLifecycleVersion"
-    //noinspection LifecycleAnnotationProcessorWithJava8
     kapt "androidx.lifecycle:lifecycle-compiler:$rootProject.archLifecycleVersion"
-    // ViewModel Kotlin support
+    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.archLifecycleVersion"
+    // viewmode kotlin support
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$rootProject.archLifecycleVersion"
-    // Coroutines
+    // coroutines
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.coroutines"
     // UI
-    implementation "com.google.android.material:material:$rootProject.materialVersion"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    //Card view
     implementation 'androidx.cardview:cardview:1.0.0'
+    implementation "com.google.android.material:material:$rootProject.materialVersion"
 
-    // TESTING
-    testImplementation 'junit:junit:4.12'
-    testImplementation "io.mockk:mockk:1.9.3"
+    // testing
     testImplementation "com.squareup.okhttp3:mockwebserver:4.2.1"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    testImplementation "io.mockk:mockk:1.9.3"
+    testImplementation 'junit:junit:4.12'
+
+    // android testing
+    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.androidxArchVersion"
+    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.coreTestingVersion"
+    androidTestImplementation "androidx.room:room-testing:$rootProject.roomVersion"
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
 
-    implementation "com.squareup.retrofit2:retrofit:2.6.2"
-    implementation "com.squareup.retrofit2:converter-gson:2.6.2"
-
-    androidTestImplementation "androidx.room:room-testing:$rootProject.roomVersion"
-    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.androidxArchVersion"
-    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.coreTestingVersion"
-
+    // detekt
+    detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.2.2"
 }
diff --git a/build.gradle b/build.gradle
index e65847d..1038f12 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext.kotlin_version = '1.3.60'
     repositories {
@@ -12,8 +10,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.2.2"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
diff --git a/wrapper/build.gradle.kts b/wrapper/build.gradle.kts
index 64a9c29..6d3203c 100644
--- a/wrapper/build.gradle.kts
+++ b/wrapper/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    // apply the java-library plugin to add support for Java Library
     `java-library`
 }