massive commit of PSR and formatting fixes