minor optimising