AppStore refactoring