Refactored fit selections