Refactoring - step 2