Tidy up of tags and conditions for daily cron file