refactor for the latest Stream-Simple