Little refactoring before moving onto step 5