cleaned up some code in marc.py