PHPDoc/cleanup