Fixed syntax

There was weird "assign to a function" syntax in there that didn't work so I FIXED IT
Update model.py
merged things