Commented some of the worlds and clean up code