cleaning, having structs for both requests