Minor clean up in notes and such