Cleaned up the django views ..