Move to class property over direct use of enviroment vars