Improving __unicode__ method on both models