Fix typos and trailing whitespace