Refactor for unicon