refactorings, version bump