More fixes about PSR and dockblocks