Convert to Modern Objective-C syntax