making more PSR2 compliant