cleanup and improvement to unread indicators