Cleanup formatting a bit