Refactoring version