Cleaned up variables in world module.