clean up kwargs