Clean up cruft and tweak tooltip formatting