refactoring configuration to use better argument-dependency style.