Tidied up build.gradle