Code clean-up, refs #7327