Refactoring phase #1.