Added envify to replace ENV variables on the fly
Removed obsolete typeof calls