Make StreamsFileReader reusable. Minor polishing.