Refactoring for ARC