Tidy up white space