Convert to Modern Objective-C Syntax