Modularize the fingerprint verification; fix typo