Refactor and clean up `msuac` class