Cleaning up more ouput file openings