Lint errors fixed, except still using stream.