Refactored variable and class names
Migration to use secret_key
Linkifying links