cleaning up, integrating smarter minimizer selection