MNT: Working to integrate refactors from late night commissioning