update to obj-c modern syntax