COOK-3636 Updates from code review