Clean up white space a bit