Doc fix & extraction

Extracted stream handling from listener