trying to clean up arguments of instances and plugs as much as possible