Coding style fixes

Fixed some coding style issues with https://github.com/fabpot/PHP-CS-Fixer