whitespace, and general PEP8 scrubbing