Reformat, cleanup per Java standards.