A little clean-up
More log message fun