Clean individual models
Refactor tuple unpacking
Merge branch 'clean-models'