PEP8: Remove trailing whitespace
PEP8: Whitespace changes to match pep8
Merged.