Catpure stream OK, the code has been cleaned