Skip to content

Apply more suggestions from Jon's code review #2570

Apply more suggestions from Jon's code review

Apply more suggestions from Jon's code review #2570