Tidy up minor whitespace inconsistencies