Fix @returns >> @return phpdoc

Change-Id: I90983a4f8e0e843152b0bd39de5d3eb128abe3ce
Use public instead of var in classes

Change-Id: I81cd8762cec028ed941a43a9c35aea9bfdf423be