Converted to ARC and Modern Objective-C Syntax