Refactoring, step 3. Done!