more PSR cleanup