Improve logging
Revert "Improve logging"

This reverts commit 93ecc1ef8d0b2cf9da0f635cda18e4a7b1ddf093.
Improve logging