PEP8/pylint cleanup