Code cleanup & optimizations + added the ability to read from a PCAP file