small refactoring in configuration