Refactor World class