App refactored.