simplify core plugin
formatting
wip