logger work
code clean up
Glimpse changes