completed config refactoring