Refactor fit_intercept case