Fixed pep8 and pylint warnings