store: refactor into simpler form
2.0.0