Docblock and PhpStorm code inspection fixes