Simplify WorldService code