Formatting and cleanup of java source code