Change the Cryptography-specific variable names
Remove some extra parameters in function declarations