Refactored Code and enabled world gen config options