Improve logging messages, whitespace cleanup