MNT: Additional intermediate refactoring saves so that I can work on a different machine