removing pep8 violations on 2.0 branch