Fixed a few PSR2 code style warnings