Updated for modern Obj-C syntax.

[UPDATED]   Using modern Obj-C syntax throughout.