move env to config, changes add review