Obj-C style changes