Fingerprint database insertion, a little restructuring