minor refactoring
minor refactoring to app config