Minor refactor to regression evaluation