Some Cleanup, Made World nicer looking underneath