[yrc_minor_char_refactors]