Clean up of Java code

Readability.  Formatting preferences.