Clean up code

Ran Source > Clean up in Eclipse to apply IJ2 code template.