Conforming to PSR-2