refactor store slightly