Improved logs a bit further with simplifying.