More cleanup of feeder.py in prep for map reduce.