Eliminating some repetitiveness during file analysis (in progress)