Cleaned up run.py and views.py