Cleaned up logging.