minor cleanup + batch script