Optimization of surfactant-solvent systems