Tweak for PSR-2 compliance