Clean up stream format