Cleaning up and fixing bat file