build.gradle cleanup & comments