Minor code clean up and reorganization to GA 2D minimizer