PSR2
refactor