Refactored world