Re-format and fix possible crash
Another possible crash fix
Xcode 5 seems to use C-Plus-Plus instead C++