Improve Gradle build script