Tidying up State.