Part 1. Refactoring