code cleaning, removed stream filtering