Code refactor, models.