Improve logging, whitespace formatting