[WIP] Refactor MSM

To me, it's mostly the indent.