remove todo
refacto infinite stream