cleaned up product scaffold