Renamed .bat, Added clean up