Refactoring phase #2.