Minor cleanup on AppModel
Pseudocode