Continue refactoring
Refactoring fingerprinting process