Refactored methods in World a bit.