Add checkStyle task to the Gradle job
Minor code reformatting subsequently