store refactoring