CS fixes

Some CS fixes made by https://github.com/FriendsOfPHP/PHP-CS-Fixer