Cleaned up output files a bit