[PLUGIN] minor refactor