Convert to modern objC syntax