Refactored Some World Generation Code