Code cleanup and making the HTML be valid HTML
Merge PR.
Merge pull request #14 from dotnet/cleanUp

Code cleanup and making the HTML be valid HTML