Minor tidying

Removing some debug, extra html, and renaming some things.

<!---
@huboard:{"order":190.25,"custom_state":""}
-->