Updated Formatting

This uses the current Mesosphere Java style.
Please put this back to one-per-line, so we can read all the options easier/faster? Maybe this style rule (and perhaps some others) should be disabled until we can agree on how they're used.