Refs #17226 - Minor changes after code review