Adding a tooltip and removing unnecessary code.