Pep8/Pylint Fixes