config refactor
config