Patch/fingerprint tidy 1

Some cleanup to fingerprint code.