Refactor, version bump.