Cleaned things up a little bit, removed redundant HTML code