great config refactoring