cleaned up PHPDocs and uses