Iteration 5: Refactoring Idea