Fix some typos and trailing whitespace