[#115] Clean up

* Provide helper method for closing streams