Pass 1 for PSR-2 compliance