Formatting and some work in multiplier.v