Working on refactoring tooltips