pep8 related clean ups, updated for new push to pypi