Updated code to new XCode version
Minor cleanup