Refactor worldPop example