Cleaning up whitespace