Minor tweak to kwargs to not use from