Update project based on Xcode recommendations.
Fix formatting and semantic issues...

Fix formatting and semantic issues identified by Xcode.