Pep8
Some refactor for cleaner World code separation