Cleanup based on phpdoc output and file review
Merge pull request #293 from mbabker/review

Cleanup based on phpdoc output and file review