Tidy up code

[x] comment out unused code
[x] do proper html syntax