Refactor plugin above below