Clean up note operations a little