Minor tidying

Removing some debug, extra html, and renaming some things.