cleans, tightens analyst
makes environment config extensible