Updated for Coding standards (done by php-cs-fix)