Some CS fixs (by me and php-cs-fixer)
CS changes