clean code per PSR2 suggestions