Some refactoring was done. Put the Checksum validation in its own class.