Updated Formatting

This uses the current Mesosphere Java style.
Could you maybe alphabetize all of these so we can read through them easier?