Refactor Commissioner