Improve DSL for Env helper
Remove some useless stuff