Fixed pep8/pylint violations