Cleaned up the logging a bit.