Refactor logic intefaces