refactor some code and move to streams2