Code clean up following Xcode 5 change