Replace FormatDivisibleMP, FormatIndivisibleMP by FormatMP

Removes 154 lines, builds on #208.

Tested -- works fine and output is exactly the same.