code review, conversion to standard PSR-2