EllipsoidFactor: remove commented code, tidy up some comments