*Refactoring. Stage 1