[TOOLS] syntax cleanup