cleaning up for Note support, a little bit