code refactoring (plugins)