Clean up whitespaces
Minor fixes