Clean up stdout reading code