Refactor and simplify using mout