updated to reflect changes in models.py
cleaning up