cleaning up note collision handling a bit