Fix typos, remove trailing whitespace