Clean up some more of the pycheddar source