Code Cleanup & WorldGen Fix