Cleaning up build.gradle