Tightened up code in analyze_raw_file()

Tightened up the code for analyze_raw_file() a bit