refactored a bit plus fingerprint and keys
refactored a bit plus fingerprint and keys