Cleaned up stdout messages and file names.