And more tidy sp.product editing