Clean up formatting a bit to better match conventions... again...