Improving gradle build