Cut down on state.c