Some PSR2 improvements