Fix pep8/lint warnings