Refactoring : models/data.py