Improve gradle setup