Fixed environment variable names & some formatting.