PSR2, decrease complexity