Convert to modern Obj-C syntax