Refactor CWorldEditor