Cleaned up tooltip code