store refactor