Fix pep8 reported issues