make kwargs more consistent