LogDecorator refactored