refactor configurator