Refactor Code to ARC Support