formatter: Improve integration of notes