Minor refactoring in UCF to improve logging.