autoformating by PhpStorm
removed duplicated message
clean up, changes after linting
Merge branch 'DAR-1182' into DAR-1064