Make PHP more PSR-2 compliant