refactor all stores