MDL-31936 workshop: Reset Minor Tidy up