refactoring in store