Refactoring phase #5.