Fix whitespace, reformat