Update env setting, aka clean up things and move them around