Refactored the world