Added pep8 fixes