Clean up of control byte logic in protocol