fixed PSR2 coding violations