minor
some refactoring for lazy loading config