refactor of stores