Fix whitespace, comments and typos