Update PHPDoc blocks to be more consistent and ubiquitous