Tweak setting env
Improve notation