Product refactored addAttribute(), removed more nesting