* store: cleanup * minor change Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>