Simplify bat script a bit