More minor changes to whitespace, brackets, in product class.