Refactored fit selections for DAWNSCI-891