pep8 and pylint fixing