Now inline with PSR coding standards