Small refactoring in the configuration