Simple refactoring step 2