some more tiny storage savings