- Reduced number of calls to API.
- Changed output of env command.