cleaned up the configuration builder