Made WarcIterator the default. 
Some code cleanup