cleaning up/optimizing  configurator