Cleanup Gradle Files

* removed duplicate declarations
* unify code style