Move Passage into models.py
Eliminate magic variables