Put dry-run message at beginning, better formatting