Looks like some of the code will still get reformatted by the eclipse (mvn java-formatter:format shows quite a few). We should reformat them in one bunch, make a checkstyle version of the eclipse formatter, and add that to the verify lifecycle.