Refactor completed.