[DF-2474] Fixed tooltips. Code cleanup.