Updated tooltip with more data fields
Cleanup