Change formatting to Java Conventions (slightly modified).