Clean up
Fix refresh of token figures on multi-line annotation