[TASK] PHPCS add missing @return
[REF] PHPCS - refactoring