- Made sure that if we fail due to an internal change of maxima we
  still fail silently.
- cleaned up the capitalization of the code
- removed a unneeded statement that made sure that a previously
  defined variable is defined.