Refactor World controller