Add DZIL tidying for next go round