Gradle update + Cosmetics