Refactor Adder and Adder16 into single class