PEP8 Compliance

This merge addresses several minor pep8
violations (whitespace).