Bump Gradle to latest
Fix inconsistent bracket styling