Added product model
little budget test refractor for greater readability