refactoring for better versioning discipline