Did some cleanup to make the HTML a little easier to read.