Perfect tooltips and tidied code