Refine commend tag format