clean up
Improve logging