More PSR-2 compliance