Updated Formatting

This uses the current Mesosphere Java style.
Enums are usually written one value per line, to make it easier to comment on them, diff/blame the code for changes, etc.