PEP8 codestyle housekeeping

Some PEP8 codestyle fixes