refactoring and version bump