Refactoring v.2