Cleaned up the products scaffold