fixed no return value in dry_run mode
refactored comments import as function