Code cleanup pep8 fixes