Reorder usage items
Improve env settings