Code cleaning done, updated views.py #172