App refactoring.