Improve Gradle build