cleanup streaming-plot
fix conflict
rename pop_frame to pop, small cleanup