Convert to **kwargs, let's be more pythonic