Fix whitespace and typos