Refactor env
Merge pull request #38 from androbtech/remove_duplication_env

Refactor env