more consistent use of Modern Objective-C syntax.