Refactoring to use ARC