Refactor plugin output