Refactoring V.1