Better function names; add Output Compare B things