Code cleaning, and extended generalization for additional EPANET input files