PSR fix all the things