Clean-up whitespace