Further revised naming convention for env vars
Removed debug  code