Final refactorings for Iteration 1