Minor cleanup
Improve logging