Refactored logs