Some PEP8/Pylint fixes