Slight refactor of product transformer