PHPDoc clean up and clean up after adding namespaces