ReadStream refactoring.