Product list
Code cleanup