fix psr2 violations in Plugin/Util