Some PEP8 compliance

Refactored the code here and there for PEP8