Some beautifying changes to uvis_contam.py, untested as yet.