Slight refactoring of build.gradle file