Updated to use Html class and eliminated usage of unnecessary wiki globals.

Change-Id: Ie80c8a0e24d102c3cbfb832487556ce504cb0a04