Working on canceling of streaming, couple of code cleanups