Cleaned up pcap and disconet.  Read source for more
washing through astyle