Refactor IV