Improved PSR2 Compatible output generation