Refactors ENV set-up and comparisons

Makes environmental variable set-up more terse

Removes object instantiation for basic comparisons

Signed-off-by: Aleksandrs Ļedovskis <aleksandrs@ledovskis.lv>