Pylint/PEP8 cleanup