Improving the build gradle script a bit