More PSR-2 compliant