Refactoring of MassStart.
Martin and Mikael