#94 - Updated logging for consistency