Removing reliance on environmental variables