Cosmetics, refs #14827