Clean up formatting... ocd...