Clean up formatting a bit