Addition of the note data type and a bit more cleanup