Minor improvements to log levels and whitespace

No functionality changes here, just a bit of cleanup.