Use variables, when the're there

Why not use the environment variables, when they are there...

Small blunder by me.