Some small cleanup and improved filenames.