Some clean up on views.py