More refactoring for ARM