Improve logging, use underscore