refactor store.go update