Updated to modern objc syntax