Rework of batch files