Converting to modern objective-c syntax