MNT: Refactor based on late night commissioning shiftT