Massive commit of PSR and other formatting fixes