whitespace changes
merge more buffers into log calls