minor phpdoc cleanup and imports