Tidy up article comments and move comment form into snippet
Tidy up product and collection loops