Improve setup env script