Streamlined update_state usage

Switched from kwarg usage to arg
Some minor clean to improve memory usage