Dramatic simplification of the input file