Fixes #46: Clean-up and coument environment variables