Refactoring v.1