Add '--dry-run' command-line option
Clean up