Code cleanup.

Restored the paradigm of hunting for the lowest chi2 and mle