optimize iports of ToolTip and some cleanup of rest files