Corporation refactor