Prefer scanner for AddKeysFromFile
Refactor: remove unnecessary variables