I5: Refactoring Idea Completed