minor style tweaks
memory leak, Persistent callback not Disposed