Fixed pylint/pep8 violations