part one

Part 1. Refactoring