refactoring
single pass cleanups
version bump