refactor env
new feature: store