Update to environment config, removed environmentNames, refactored code
Update to environment config