Separated Callbacks; cleanup…
Proper namespace!!