Convert to modern Objective-C