nicer syntax for product
a few more style improvements.