First step of refactoring is finished;