PHPDoc and style changes
Merge branch 'style-changes'