Cleanup/fix tool model