style improvements
Refs #20358