Cleaned up csp.py.