Incorporating changes from code review and protocol state updates