PHPStorm coding style fixes