Upgrade to use Gradle only. Fix Formatting according to Checkstyle formatting rules.