Improve and simplify log messages