PEP8 and Pylint cleanup