Refactor parts of MUC for readability

No tests broken, but no tests added either.
No changes in module logic should be introduced by these commits.