Refactoring begining