Better organisation of environment variables.