cleaned up config to support environments