Making Fit() more idiomatic