Made things slightly more sklearn like.