Refactor Store