[debt] PSR fixes
[debt] PSR fixes