more formatting on views.py
merged conflicted views.py