Add some comments on models, slight refactor