Make recent commit pep8 compliant to pass jenkins tests