sorting out some PSR2 compatability issues