more granular target decoration
reformat lists