New way to retrieve ENV vars in compile and fixed indenting