Fix typos and whitespace
Merge pull request #1280 from jwworth/task/fix_typos_and_whitespace

Fix typos and whitespace