modifications to tool classes
formating changes