More PSR2 cleanup