[#71632680] Reduce number of objects that get created

Signed-off-by: Ellie Schneiders <ems2141@gmail.com>