Logging cleaned up a bit.