Refactored App