refactor world static