remove world pointer from team
code cleanup
code refactoring