Refactor complete.