refactoring for app store