Cleaned up the build.gradle a bit