Fix whitespace inconsistencies