Remove whitespace
Fix some typos
Merge pull request #1182 from jwworth/task/fix_typos_and_whitespace

Task/fix typos and whitespace