Refactoring for iteration 3 started.