cleaning a bit
first version of async stream / less cpu load