Minor changes to file reader