Refactor $log decorators