Fix style issues

all just style issues.  FourBitAdder was a beast.