Clean up and modified output