fixes to validate against PHP-FIG PSR