Small refactor to products spec