Cleanup, output reformat