attempt to add tooltip and tidy code (failure)
Revert "attempt to add tooltip and tidy code (failure)"

This reverts commit 5815043e9d689f9fdf9070ab58e10144257650ae.