Code cleanup for cs_compute.py.  Still in progress.