Refactor store