model.py cleanup
Merge pull request #8 from benediktkr/model-cleanup

model.py cleanup