AppUtils refactoring