reformat to match conventions in eclipse-format.xml