logs refactored