Using environment variables. Clean up comments.