Converted to Modern Objective-c syntax - cleaned some Xcode 4.6 warnings up