clean up commented code and pep8 items