Clean up views.py to use new classes, forms, naming