More cleanup. Changed env to get. Introduced streams.