Simplified the way files are read