fix: reduce string comparisons in ADC decoding, cleanup

fix: reduce string comparisons in ADC decoding, cleanup #2310