Refactor World

Change: improve documentation wording.
Change: rename local variables.