Added some improvement found after Xcode Analyzer