Complete addressing all phpdocumentor warnings