Cleaned parsing of files