More PSR-1 compliance