Minor cleanup and bug fix

Removed some commenting.  Fixed a potential bug failure to find a
solution could cause a call to the optimization function to crash.