minor cleanup and optimization
minor pep8 cleanups
minor package version