Refactoring of input file parsers