Clean up pep8 and pylint violations