Cleanup, comments, dry run and verbose modes