Some PEP8 Lint fixes