use more ENV vars where applicable