Migrate to modern obj-c syntax