cleaned up, some pep8 warnings addressed