Updated comments and property declarations to remove all phpdoc generation errors