Remove 2-measurement classification option.

Object classification can only happen based on the values of
a single measurement.

Some whitespace changes were included too - this is now pep8-compliant.