fixes to environment variable name discrepancy
fixes for foodcritic suggestions