Updated formatting

Eclipse wants stuff formatted this way. Note, there are various
formatting changes that I don't agree with, but from what I saw, this
was better than what we had. Furthermore, we should agree on a coding
style and update the Eclipse formatter for Java accordingly (under
Preferences). Then the formatter will actually work properly for us.