refactoring appPattern here and there.