Tidied up Gradle script and properties