Mashete store refactoring