Even more PSR-2 compliant