Remove extra whitespace and fix a comment