Refactor to executive pattern.