Convert to modern objective-c syntax