PEP8/Pylint cleanup