Refactoring store system