Modern obj-c syntax refactor