Step 1 - test refactoring