Added some structure to the produced HTML.