Removed extra generator function and call line_iter func directly in stream
Source cleanup