Updated Formatting

This uses the current Mesosphere Java style.
Move the 'null' to the previous line, so both lines start with '&&'