eoinmcafee00 refactor env variable declaration to one statement