simplify Store
rework store stuff