Cleaning up. Adding PACKET_ID fields to packets