Simplification and bug fixes
Cleanup, refactoring, version bump