config - minor refactoring