Small simplifications with managing state