App post refactoring