Tidy up some insanity in the creating of new notes