improved tools formating