+ More code cleanup to clear more XCode warnings