Minor app refactoring