addnote.cpp cleanup