Refactor wrapper.