@GrahamCampbell thanx for the feedback.
I will change the PSR-2 issue tonight.
@panique what do you suggest on the die. I can remove it if you like or I can replace the by return as @GrahamCampbell is suggesting
I will change it tonight when i have your feedback