Removed dependency on enviornment variable