Minor refactor of disconnection state