more tidying up and separating df.streaming from df.inmemory