Update formatting of tools and apostrophes in tools