#2 cleaning up product model