Format some code
Fix tag service batch script name