Refs #17684: Code cleaning