Use FileIterator and general code maintenance.