Cleaning up the iostreams fix