code reorganization + 80 bits fingerprint