consolidate effort for updating default_kwargs. removed un needed code.