refactor(store.go) handle short condition first