Cleaning some world code
Merge pull request #15 from chylex/master

Cleaning some world code