Consistent formatting pass

Use Java Conventions from now on