Small cleanup in World