Tidy up the note controller