env: cleanups
Merge pull request #4 from davecheney/100-env-cleanups

env: cleanups