Tidy up gradle build scripts