Cleaned up logging a little.