Cleaned up kwarg passing