Print checksum in hex, and print the actual checksum, plus cleanup
Merge pull request #403 from superjamie/cdp-checksum-and-cleanup

Print CDP checksum in hex, print the actual checksum, cleanup