Updated Formatting

This uses the current Mesosphere Java style.
Please make sure to add a new license in the same change that you remove the existing one, so that we have a clear license policy at all times.