chore(tooltips): Address PR comments