Refactoring V 0.1