Refactor interface.