Update project to recommended by Xcode settings
Fix variable type