Cleanup and an addon to the note-collapse