Polish, code clean up, a proper multiplier...