Update the code style a little to keep javadoc line breaks and fix import orders in a class to match our style
Update code style to remove the blank line after the class header
Update the style a little more, simple classes on one line and align wrapped method chains
Reformat all the code to the new styles