Refactoring of ARMM