minor fix: more refactoring, removing the checksum field!