Formatting changes.

This makes it consistent with everything else.
I'm forgoing changing where the spaces are around & and * for now and leaving them the same as they are currently.

We need to discuss what settings to use.