Addressing pep8 issues