Fixed some pep8 issues in the code