AppSettings refactoring