HTML cleanup
Merge pull request #69 from isfit/htmlCleanup

HTML cleanup