The refactor begins.
Refactor completed.