Update notes for submitted changes

* Simplified the singleton creation/destruction