Fixex some pep8 issues